Return NULL unless screen number is zero. We have only one screen on

2005-06-05  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkscreen-win32.c
	(_gdk_windowing_substitute_screen_number): Return NULL unless
	screen number is zero. We have only one screen on Win32.
	(gdk_screen_make_display_name): Call gdk_display_get_name() and
	return that.

diff --git a/ChangeLog b/ChangeLog
index 1bc131cabefc0a0abe34a80762dbf59b42cf7b1c..baf8688ec00a8a74bbb8ceefbbdbb0190efd1155 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-06-05  Tor Lillqvist  <tml@novell.com>
 
+       * gdk/win32/gdkscreen-win32.c
+       (_gdk_windowing_substitute_screen_number): Return NULL unless
+       screen number is zero. We have only one screen on Win32.
+       (gdk_screen_make_display_name): Call gdk_display_get_name() and
+       return that.
+       
        * modules/engines/Makefile.am
        * modules/input/Makefile.am: Decide whether to build the
        ms-windows theme engine based on the GDK backend, not based on

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1bc131cabefc0a0abe34a80762dbf59b42cf7b1c..baf8688ec00a8a74bbb8ceefbbdbb0190efd1155 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2005-06-05  Tor Lillqvist  <tml@novell.com>
 
+       * gdk/win32/gdkscreen-win32.c
+       (_gdk_windowing_substitute_screen_number): Return NULL unless
+       screen number is zero. We have only one screen on Win32.
+       (gdk_screen_make_display_name): Call gdk_display_get_name() and
+       return that.
+       
        * modules/engines/Makefile.am
        * modules/input/Makefile.am: Decide whether to build the
        ms-windows theme engine based on the GDK backend, not based on

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1bc131cabefc0a0abe34a80762dbf59b42cf7b1c..baf8688ec00a8a74bbb8ceefbbdbb0190efd1155 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
 2005-06-05  Tor Lillqvist  <tml@novell.com>
 
+       * gdk/win32/gdkscreen-win32.c
+       (_gdk_windowing_substitute_screen_number): Return NULL unless
+       screen number is zero. We have only one screen on Win32.
+       (gdk_screen_make_display_name): Call gdk_display_get_name() and
+       return that.
+       
        * modules/engines/Makefile.am
        * modules/input/Makefile.am: Decide whether to build the
        ms-windows theme engine based on the GDK backend, not based on

diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c
index 45e151a377471a46e35c04d759aa886c1e672d4d..91e3ff6a2fdd0acc9488e75c8b2a3fd8fb708a67 100644 (file)
--- a/gdk/win32/gdkscreen-win32.c
+++ b/gdk/win32/gdkscreen-win32.c
@@ -106,11 +106,14 @@ gchar *
 _gdk_windowing_substitute_screen_number (const gchar *display_name,
                                         int          screen_number)
 {
+  if (screen_number != 0)
+    return NULL;
+
   return g_strdup (display_name);
 }
 
 gchar *
 gdk_screen_make_display_name (GdkScreen *screen)
 {
-  return g_strdup ("");
+  return gdk_display_get_name (_gdk_display);
 }